From: Glenn Morris <rgm@gnu.org>
Date: Tue, 25 Aug 2009 07:36:49 +0000 (+0000)
Subject: (byte-compile-file-form-require): Tweak previous change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10914
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=61390c19fb50ac42b622b019995ba795a952aa24;p=emacs.git

(byte-compile-file-form-require): Tweak previous change.
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 70557d5e247..b8e63a4f5f8 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2324,9 +2324,9 @@ list that represents a doc string reference.
   (let ((args (mapcar 'eval (cdr form))))
     (apply 'require args)
     ;; Detect (require 'cl) in a way that works even if cl is already loaded.
-    (when (member (car args) '("cl" cl))
-      (if (byte-compile-warning-enabled-p 'cl-functions)
-	  (byte-compile-warn "cl package required at runtime"))
+    (when (and (member (car args) '("cl" cl))
+	       (byte-compile-warning-enabled-p 'cl-functions))
+      (byte-compile-warn "cl package required at runtime")
       (byte-compile-disable-warning 'cl-functions)))
   (byte-compile-keep-pending form 'byte-compile-normal-call))